dgit.raspbian.org Git - yaml-cpp.git/log

Merge version 0.8.0+dfsg-7+rpi1 and 0.8.0+dfsg-9 to produce 0.8.0+dfsg-9+rpi1

Merge yaml-cpp (0.8.0+dfsg-9) import into refs/heads/workingbranch

[PATCH 1/2] [cmake] Require minimum CMake version 3.5

Soon CMake 4.0 will be released. It requires that projects
set a minimum required CMake version of 3.5. There is a
workaround with an additional flag, but it would is better
to increase the minimum required version.

Gbp-Pq: Name 1351.patch

[PATCH] Don't install embedded copy of GTest

Goole Test itself documents the `INSTALL_GTEST` option as something that projects embedding it should set to `OFF`. Leaving it on means that projects downstream from libraries that embed it are likely to encounter conflicting copies. This is particularly annoying because GTest does not maintain anything like a stable API, and so causes builds to fail if include paths pick up an inappropriately installed copy ahead of the one that the code wanted.

Fixes #488

Gbp-Pq: Name 1171.patch

[PATCH] Specify CMake policy range to avoid deprecation warning

CMake 3.27 started issuing a deprecation warning for any
cmake_minimum_required() call that specified a minimum
version older than 3.5. Specifying a version range instead of
a simple minimum version avoids that warning without
raising the minimum supported CMake version. The NEW
policy behavior will be used for all policies introduced up to
CMake 3.14 with this change.

Gbp-Pq: Name 1211.patch

[PATCH] Fix testsuite with gcc-13

cd /<<PKGBUILDDIR>>/build-static/test && /usr/bin/c++ -DYAML_CPP_STATIC_DEFINE -I/<<PKGBUILDDIR>>/test/integration -I/<<PKGBUILDDIR>>/test -I/<<PKGBUILDDIR>>/src -I/<<PKGBUILDDIR>>/include -isystem /usr/src/googletest/googlemock/include -isystem /usr/src/googletest/googlemock -isystem /usr/src/googletest/googletest/include -isystem /usr/src/googletest/googletest -g -O2 -ffile-prefix-map=/<<PKGBUILDDIR>>=. -flto=auto -ffat-lto-objects -fstack-protector-strong -Wformat -Werror=format-security -fdebug-prefix-map=/<<PKGBUILDDIR>>=/usr/src/yaml-cpp-0.8.0+dfsg-1~build1 -Wdate-time -D_FORTIFY_SOURCE=2 -std=gnu++14 -Wno-variadic-macros -Wno-sign-compare -DGTEST_HAS_PTHREAD=1 -MD -MT test/CMakeFiles/yaml-cpp-tests.dir/binary_test.cpp.o -MF CMakeFiles/yaml-cpp-tests.dir/binary_test.cpp.o.d -o CMakeFiles/yaml-cpp-tests.dir/binary_test.cpp.o -c /<<PKGBUILDDIR>>/test/binary_test.cpp
/<<PKGBUILDDIR>>/test/binary_test.cpp: In member function ‘virtual void BinaryTest_DecodingNoCrashOnNegative_Test::TestBody()’:
/<<PKGBUILDDIR>>/test/binary_test.cpp:11:38: error: narrowing conversion of ‘-58’ from ‘int’ to ‘char’ [-Wnarrowing]
11 | std::string input{-58, -1, -99, 109};
| ^

Gbp-Pq: Name 1216.patch

[PATCH] Update cmakelists to use system googletest if available.

There is no need to use the embedded gtest code copy in Linux systems, if they already provide the googletest framework system-wide.
Search for it, and fallback to the embedded one if the system one is not detected.

This patch has been also contributed by Simon Quigley <tsimonq2@debian.org>

Gbp-Pq: Name 1035.patch

yaml-cpp (0.8.0+dfsg-9) unstable; urgency=medium

  * Cherry-pick 3 fixes for cmake from upstream
    - 1211.patch
    - 1171.patch
    - 1351.patch

[dgit import unpatched yaml-cpp 0.8.0+dfsg-9]

Import yaml-cpp_0.8.0+dfsg-9.debian.tar.xz

[dgit import tarball yaml-cpp 0.8.0+dfsg-9 yaml-cpp_0.8.0+dfsg-9.debian.tar.xz]

Merge version 0.8.0+dfsg-6+rpi1 and 0.8.0+dfsg-7 to produce 0.8.0+dfsg-7+rpi1

Merge yaml-cpp (0.8.0+dfsg-7) import into refs/heads/workingbranch

[PATCH] Fix testsuite with gcc-13

cd /<<PKGBUILDDIR>>/build-static/test && /usr/bin/c++ -DYAML_CPP_STATIC_DEFINE -I/<<PKGBUILDDIR>>/test/integration -I/<<PKGBUILDDIR>>/test -I/<<PKGBUILDDIR>>/src -I/<<PKGBUILDDIR>>/include -isystem /usr/src/googletest/googlemock/include -isystem /usr/src/googletest/googlemock -isystem /usr/src/googletest/googletest/include -isystem /usr/src/googletest/googletest -g -O2 -ffile-prefix-map=/<<PKGBUILDDIR>>=. -flto=auto -ffat-lto-objects -fstack-protector-strong -Wformat -Werror=format-security -fdebug-prefix-map=/<<PKGBUILDDIR>>=/usr/src/yaml-cpp-0.8.0+dfsg-1~build1 -Wdate-time -D_FORTIFY_SOURCE=2 -std=gnu++14 -Wno-variadic-macros -Wno-sign-compare -DGTEST_HAS_PTHREAD=1 -MD -MT test/CMakeFiles/yaml-cpp-tests.dir/binary_test.cpp.o -MF CMakeFiles/yaml-cpp-tests.dir/binary_test.cpp.o.d -o CMakeFiles/yaml-cpp-tests.dir/binary_test.cpp.o -c /<<PKGBUILDDIR>>/test/binary_test.cpp
/<<PKGBUILDDIR>>/test/binary_test.cpp: In member function ‘virtual void BinaryTest_DecodingNoCrashOnNegative_Test::TestBody()’:
/<<PKGBUILDDIR>>/test/binary_test.cpp:11:38: error: narrowing conversion of ‘-58’ from ‘int’ to ‘char’ [-Wnarrowing]
11 | std::string input{-58, -1, -99, 109};
| ^

Gbp-Pq: Name 1216.patch

[PATCH] Update cmakelists to use system googletest if available.

There is no need to use the embedded gtest code copy in Linux systems, if they already provide the googletest framework system-wide.
Search for it, and fallback to the embedded one if the system one is not detected.

This patch has been also contributed by Simon Quigley <tsimonq2@debian.org>

Gbp-Pq: Name 1035.patch

yaml-cpp (0.8.0+dfsg-7) unstable; urgency=medium

  * Run wrap-and-sort.
  * Update Standards-Version to 4.7.0, no changes needed.
  * Add my name to the packaging copyright.

[dgit import unpatched yaml-cpp 0.8.0+dfsg-7]

Import yaml-cpp_0.8.0+dfsg-7.debian.tar.xz

[dgit import tarball yaml-cpp 0.8.0+dfsg-7 yaml-cpp_0.8.0+dfsg-7.debian.tar.xz]

Merge version 0.8.0+dfsg-3+rpi1 and 0.8.0+dfsg-6 to produce 0.8.0+dfsg-6+rpi1

Merge yaml-cpp (0.8.0+dfsg-6) import into refs/heads/workingbranch

[PATCH] Fix testsuite with gcc-13

cd /<<PKGBUILDDIR>>/build-static/test && /usr/bin/c++ -DYAML_CPP_STATIC_DEFINE -I/<<PKGBUILDDIR>>/test/integration -I/<<PKGBUILDDIR>>/test -I/<<PKGBUILDDIR>>/src -I/<<PKGBUILDDIR>>/include -isystem /usr/src/googletest/googlemock/include -isystem /usr/src/googletest/googlemock -isystem /usr/src/googletest/googletest/include -isystem /usr/src/googletest/googletest -g -O2 -ffile-prefix-map=/<<PKGBUILDDIR>>=. -flto=auto -ffat-lto-objects -fstack-protector-strong -Wformat -Werror=format-security -fdebug-prefix-map=/<<PKGBUILDDIR>>=/usr/src/yaml-cpp-0.8.0+dfsg-1~build1 -Wdate-time -D_FORTIFY_SOURCE=2 -std=gnu++14 -Wno-variadic-macros -Wno-sign-compare -DGTEST_HAS_PTHREAD=1 -MD -MT test/CMakeFiles/yaml-cpp-tests.dir/binary_test.cpp.o -MF CMakeFiles/yaml-cpp-tests.dir/binary_test.cpp.o.d -o CMakeFiles/yaml-cpp-tests.dir/binary_test.cpp.o -c /<<PKGBUILDDIR>>/test/binary_test.cpp
/<<PKGBUILDDIR>>/test/binary_test.cpp: In member function ‘virtual void BinaryTest_DecodingNoCrashOnNegative_Test::TestBody()’:
/<<PKGBUILDDIR>>/test/binary_test.cpp:11:38: error: narrowing conversion of ‘-58’ from ‘int’ to ‘char’ [-Wnarrowing]
11 | std::string input{-58, -1, -99, 109};
| ^

Gbp-Pq: Name 1216.patch

[PATCH] Update cmakelists to use system googletest if available.

There is no need to use the embedded gtest code copy in Linux systems, if they already provide the googletest framework system-wide.
Search for it, and fallback to the embedded one if the system one is not detected.

This patch has been also contributed by Simon Quigley <tsimonq2@debian.org>

Gbp-Pq: Name 1035.patch

yaml-cpp (0.8.0+dfsg-6) unstable; urgency=medium

* Fix hurd build

[dgit import unpatched yaml-cpp 0.8.0+dfsg-6]

Import yaml-cpp_0.8.0+dfsg-6.debian.tar.xz

[dgit import tarball yaml-cpp 0.8.0+dfsg-6 yaml-cpp_0.8.0+dfsg-6.debian.tar.xz]

Merge version 0.7.0+dfsg-8+rpi1 and 0.8.0+dfsg-3 to produce 0.8.0+dfsg-3+rpi1

Merge yaml-cpp (0.8.0+dfsg-3) import into refs/heads/workingbranch

[PATCH] Fix testsuite with gcc-13

cd /<<PKGBUILDDIR>>/build-static/test && /usr/bin/c++ -DYAML_CPP_STATIC_DEFINE -I/<<PKGBUILDDIR>>/test/integration -I/<<PKGBUILDDIR>>/test -I/<<PKGBUILDDIR>>/src -I/<<PKGBUILDDIR>>/include -isystem /usr/src/googletest/googlemock/include -isystem /usr/src/googletest/googlemock -isystem /usr/src/googletest/googletest/include -isystem /usr/src/googletest/googletest -g -O2 -ffile-prefix-map=/<<PKGBUILDDIR>>=. -flto=auto -ffat-lto-objects -fstack-protector-strong -Wformat -Werror=format-security -fdebug-prefix-map=/<<PKGBUILDDIR>>=/usr/src/yaml-cpp-0.8.0+dfsg-1~build1 -Wdate-time -D_FORTIFY_SOURCE=2 -std=gnu++14 -Wno-variadic-macros -Wno-sign-compare -DGTEST_HAS_PTHREAD=1 -MD -MT test/CMakeFiles/yaml-cpp-tests.dir/binary_test.cpp.o -MF CMakeFiles/yaml-cpp-tests.dir/binary_test.cpp.o.d -o CMakeFiles/yaml-cpp-tests.dir/binary_test.cpp.o -c /<<PKGBUILDDIR>>/test/binary_test.cpp
/<<PKGBUILDDIR>>/test/binary_test.cpp: In member function ‘virtual void BinaryTest_DecodingNoCrashOnNegative_Test::TestBody()’:
/<<PKGBUILDDIR>>/test/binary_test.cpp:11:38: error: narrowing conversion of ‘-58’ from ‘int’ to ‘char’ [-Wnarrowing]
11 | std::string input{-58, -1, -99, 109};
| ^

Gbp-Pq: Name 1216.patch

Use the googletest provided by the archive instead of the embedded copy

Forwarded: https://github.com/jbeder/yaml-cpp/pull/1035
Last-Update: 2021-09-24

Gbp-Pq: Name use-archive-googletest.patch

yaml-cpp (0.8.0+dfsg-3) unstable; urgency=medium

* Upload to unstable

[dgit import unpatched yaml-cpp 0.8.0+dfsg-3]

Import yaml-cpp_0.8.0+dfsg-3.debian.tar.xz

[dgit import tarball yaml-cpp 0.8.0+dfsg-3 yaml-cpp_0.8.0+dfsg-3.debian.tar.xz]

Import yaml-cpp_0.8.0+dfsg.orig.tar.xz

[dgit import orig yaml-cpp_0.8.0+dfsg.orig.tar.xz]

Transfer symbols file fixes to new soname.

Merge version 0.6.3-10+rpi1 and 0.7.0+dfsg-8 to produce 0.7.0+dfsg-8+rpi1

Merge yaml-cpp (0.7.0+dfsg-8) import into refs/heads/workingbranch

Fix empty YAML_CPP_LIBRARIES

Bug: https://github.com/jbeder/yaml-cpp/issues/774
Bug-Debian: https://bugs.debian.org/999594
Forwarded: https://github.com/jbeder/yaml-cpp/pull/1037
Last-Update: 2021-11-13

The new version does not set EXPORT_TARGETS. As the value should be yaml-cpp
anyhow, just set it directly.

Gbp-Pq: Name cmake_set_libraries.patch

Use the googletest provided by the archive instead of the embedded copy

Forwarded: https://github.com/jbeder/yaml-cpp/pull/1035
Last-Update: 2021-09-24

Gbp-Pq: Name use-archive-googletest.patch

[PATCH] Export YAML::detail::node::m_amount

The internal header node/detail/node.h is included by public headers;
YAML::detail::node is implemented in the header itself, and thus it gets
inlined... except for its static m_amount class member, which is
instantiated in the library only. Right now all the symbols of yaml-cpp
are exported (nothing is hidden), so the linker will find node::m_amount
in the yaml-cpp library.

As solution/workaround, explicitly export YAML::detail::node::m_amount.

Gbp-Pq: Name export-m_amount.patch

fix pkg-config file and cmake one

Forwarded: not needed, upstream reworked the cmake handling
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/yaml-cpp/+bug/1880419
Last-Update: 2020-05-26

Gbp-Pq: Name fix-pkg-config.patch

symbol-visibility

commit df9206778fe9ff1bdd56d975c29c43dfe1e66de7
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date:   Fri Nov 23 15:26:53 2018 +1100

    Export only YAML_CPP_API-tagged symbols on Linux.

    This marks classes tagged with YAML_CPP_API with visibility("default"), to
    explicitly export them, and then makes the default visibility "hidden" via
    -fvisibility=hidden.

    This reduces the number of exported symbols by more than 50%, which has
    a small application start-up time and memory useage benefit. It also
    makes it more feasible to audit the set of exported symbols in automated
    ABI compatibility systems.

Gbp-Pq: Name symbol-visibility.patch

yaml-cpp (0.7.0+dfsg-8) unstable; urgency=medium

  * Ack previous NMU, thanks!
  * Add patch from Jochen Sprickerhof to export YAML_CPP_LIBRARIES.
    (Closes: #999594)

[dgit import unpatched yaml-cpp 0.7.0+dfsg-8]

Import yaml-cpp_0.7.0+dfsg-8.debian.tar.xz

[dgit import tarball yaml-cpp 0.7.0+dfsg-8 yaml-cpp_0.7.0+dfsg-8.debian.tar.xz]

Import yaml-cpp_0.7.0+dfsg.orig.tar.xz

[dgit import orig yaml-cpp_0.7.0+dfsg.orig.tar.xz]

Merge yaml-cpp (0.6.3-10+rpi1) import into refs/heads/workingbranch

fix pkg-config file and cmake one

Forwarded: not needed, upstream reworked the cmake handling
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/yaml-cpp/+bug/1880419
Last-Update: 2020-05-26

Gbp-Pq: Name fix-pkg-config.patch

Revert "fix up static, so works as DLL (#559)"

This reverts commit 774f25800e6f19f4b927023c85d1389af322da5e.

Gbp-Pq: Name 0005-Revert-fix-up-static-so-works-as-DLL-559.patch

Revert "Apply formatting/style tweaks to comply with compile time diagnostics for g++ and clang++ (#686)"

This reverts commit 0d5c57150cebb430fcc216d8066dbb28aeaafe8e.

Gbp-Pq: Name 0004-Revert-Apply-formatting-style-tweaks-to-comply-with-.patch

Revert "Disallow moving for the Parser."

This reverts commit bd7f8c60c82614bb0bd1c526db2cbc39dac02fec.

Gbp-Pq: Name 0003-Revert-Disallow-moving-for-the-Parser.patch

Revert "Improve error messages on operator[] or as<> (#656)"

This reverts commit 012269756149ae99745b6dafefd415843d7420bb.

Gbp-Pq: Name 0002-Revert-Improve-error-messages-on-operator-or-as-656.patch

Revert "Static analysis fix: replace 0 and NULL with nullptr (#738)"

This reverts commit db0bda7087a6fac811e78957787fc5037465ac4e.

Gbp-Pq: Name 0001-Revert-Static-analysis-fix-replace-0-and-NULL-with-n.patch

Fix unbounded recursion CVEs

Origin: https://github.com/jbeder/yaml-cpp/pull/807
Forwarded: yes
Bug: https://github.com/jbeder/yaml-cpp/issues/459
Bug: https://github.com/jbeder/yaml-cpp/issues/655
Bug: https://github.com/jbeder/yaml-cpp/issues/654
Bug: https://github.com/jbeder/yaml-cpp/issues/660

This cherry-picks the (so-far-unmerged) upstream pull request.
The final 5 commits of that PR are not included; they only add tests
to a file not present in the 0.6.2 (or 0.6.3) release.

From d540476e31b080aa1f903ad20ec0426dd3838be7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@debian.org>
Date: Tue, 25 Apr 2017 20:10:20 -0400
Subject: [PATCH 1/9] fix stack overflow in HandleNode() (CVE-2017-5950)

simply set a hardcoded recursion limit to 2000 (inspired by Python's)
to avoid infinitely recursing into arbitrary data structures

assert() the depth. unsure if this is the right approach, but given
that HandleNode() is "void", I am not sure how else to return an
error. the problem with this approach of course is that it will still
crash the caller, unless they have proper exception handling in place.

Closes: #459
Gbp-Pq: Name fix-unbounded-recursion-depth.patch

fix-CVE-2017-11692

commit c9460110e072df84b7dee3eb651f2ec5df75fb18
Author: Jesse Beder <jbeder@gmail.com>
Date:   Mon Jan 20 18:05:15 2020 -0600

    Fix reading empty token stack with a node with properties but no scalar.

    E.g. `!2`.

Gbp-Pq: Name fix-CVE-2017-11692.patch

symbol-visibility

commit df9206778fe9ff1bdd56d975c29c43dfe1e66de7
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date:   Fri Nov 23 15:26:53 2018 +1100

    Export only YAML_CPP_API-tagged symbols on Linux.

    This marks classes tagged with YAML_CPP_API with visibility("default"), to
    explicitly export them, and then makes the default visibility "hidden" via
    -fvisibility=hidden.

    This reduces the number of exported symbols by more than 50%, which has
    a small application start-up time and memory useage benefit. It also
    makes it more feasible to audit the set of exported symbols in automated
    ABI compatibility systems.

Gbp-Pq: Name symbol-visibility.patch

Make the build reproducible

Bug-Debian: https://bugs.debian.org/808714
Last-Update: 2016-10-11

Gbp-Pq: Name reproducible-build.patch

Install libs and cmake files to the Debian location

Forwarded: not-needed
Last-Update: 2015-11-29

Instead of moving the libs to the DEB_HOST_MULTIARCH lib directory during
packaging, have cmake install the libs directly. This is needed so the CMake
development files point to the correct location for the libs. Also, install
yaml-cpp-config.cmake, yaml-cpp-config-version.cmake, and
yaml-cpp-targets.cmake.

Gbp-Pq: Name install-cmake-dev-files.patch

yaml-cpp (0.6.3-10+rpi1) bookworm-staging; urgency=medium

[changes brought forward from 0.6.2-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 18 Jan 2019 20:49:45 +0000]
* Update symbols file for raspbian.

[dgit import unpatched yaml-cpp 0.6.3-10+rpi1]

Import yaml-cpp_0.6.3-10+rpi1.debian.tar.xz

[dgit import tarball yaml-cpp 0.6.3-10+rpi1 yaml-cpp_0.6.3-10+rpi1.debian.tar.xz]

Merge yaml-cpp (0.6.3-10) import into refs/heads/workingbranch